Bring in changes from master

diff --cc Cargo.lock
index fda1b5725f021a2547ab4d22592424e5085ec208,48f9a57edadf899d26a248a492887bf8f51a626a..226b1969896fc71ef99a928af3b6b771612fe2c7
--- 1/Cargo.lock
--- 2/Cargo.lock
+++ b/Cargo.lock
@@@ -473,4 -488,4 +488,3 @@@ source = "registry+https://github.com/r
  name = "winapi-build"
  version = "0.1.1"
  source = "registry+https://github.com/rust-lang/crates.io-index"
--

diff --cc src/cargo/ops/cargo_compile.rs
Simple merge

diff --cc tests/test_cargo_compile.rs
Simple merge